Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Mar 2010 03:58:54 +0000 (03:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Mar 2010 03:58:54 +0000 (03:58 +0000)

Trivial merge